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