Merge "p2p: add CONFIGURE_WIFI_DISPLAY permssion for P2P test"