Merge "Merge "Inform WifiConnectivityManager screen state" into nyc-dev am: 5de778c460 am: ae294bc29d" into nyc-mr1-dev-plus-aosp
tree: 9f8af38e5c8e53449dde8b863e5a142a40b7c530
  1. service/
  2. tests/