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

Change-Id: Ic2168f237508137de450833d9c4a8f7229d89090