Merge "Expose ConnectivityManager#TYPE_WIFI_P2P as SystemApi" am: dda5e925 am: fe714618 am: 968f5a96 Change-Id: Iece2ad4133751a8c258f64d7796158ffe90881ce