Merge "[automerger skipped] Merge "Remove the <= P restriction for WIFI_P2P" into qt-dev am: 2ae76cdbe8 -s ours am: 68e831ad22 -s ours
am: cb5d94390b -s ours
am skip reason: change_id I56c86b0c1912064d5a642991df32d2cefb6a8d5b with SHA1 2253ff94e3 is in history

Change-Id: I5a32e2f718871d43e02b07f7c5ae8eca0c1cb44a