Merge "Add permission MANAGE_WIFI_AUTOJOIN"