Merge "Move permissions allowlist for ExtServices"