Merge "Remove the <= P restriction for WIFI_P2P"
am: 4e8973e9a8

Change-Id: I78a209c907277be462e7a278a4b5f7f014c30f67