Merge "Inform WifiConnectivityManager screen state" into nyc-dev am: 5de778c460
am: ae294bc29d

* commit 'ae294bc29d535b4b4978bec198c2b22f227a621b':
  Inform WifiConnectivityManager screen state

Change-Id: I0e04e2b656f903885223820365d10097027b8e05
tree: 9f8af38e5c8e53449dde8b863e5a142a40b7c530
  1. service/
  2. tests/