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

Change-Id: Ida933ad5a9fec92e61696f0433ffe71d46a1fd4e