Merge "Expose ConnectivityManager#TYPE_WIFI_P2P as SystemApi" am: dda5e92547 am: fe7146187e am: 968f5a9665

Change-Id: Iece2ad4133751a8c258f64d7796158ffe90881ce