Merge "p2p: add MANAGE_WIFI_AUTO_JOIN permission for CTS external approver tests"