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