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

Change-Id: I27cb6214bf5a42c9120dd871228b224cd41e1199