Merge "Merge "Inform WifiConnectivityManager screen state" into nyc-dev am: 5de778c460 am: ae294bc29d" into nyc-mr1-dev-plus-aosp
am: 5624e5c964

* commit '5624e5c9647448b00cf5ca3591586bdd72b0772a':

Change-Id: I2208235f9189a129dfa915969364b331447ad162
tree: 2a916cb7260d6a495f7701230f224a65a37c364a
  1. service/
  2. tests/