Merge "Adds instrumentation to scan for wifi signal strength." into nyc-mr1-dev am: 44a68bc6 am: 858c096c am: 9e2d2fea Change-Id: Idf70019edbec9c2051aad25df1b93429cf93ddfd