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