Merge "Fix PermissionsHostTest for new AppPermission radio button"