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

Change-Id: I56e16f7a29f20e4ebbbcef2228fc2935b41df564