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

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