[automerger skipped] Merge "enforce stricter rules when registering...

[automerger skipped] Merge "enforce stricter rules when registering phoneAccounts" into sc-dev am: 4179e16f -s ours am: cf1d599d -s ours am: 4c573b9f -s ours

am skip reason: Merged-In I5eb2a127a44d5ec725d0ba39cb0ef478b12013de with SHA-1 f07776bc is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/21184327



Change-Id: I5f1666282de8b49421522ad0f9c0631a6cb71e5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>