Merge "Expose ConnectivityManager#TYPE_WIFI_P2P as SystemApi" am: 7916449753 am: 494d63249a

Change-Id: Ic2168f237508137de450833d9c4a8f7229d89090
tree: e9ea5b6ed087eb5e0701ec7d2933204cd8fca7e9
  1. core/
  2. services/
  3. tests/