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

Change-Id: Iece2ad4133751a8c258f64d7796158ffe90881ce
tree: 542beee2fa795b213ae54650113e93a5fa033ec0
  1. core/
  2. services/
  3. tests/