[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: ae5451be -s ours am: 194c8d3d -s ours am: 27ba1a1c -s ours am: 89e27d7c -s ours am: 573e0524 -s ours am: decc10e3 -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: I7f46694cb5d6f1320bbc6c88db3348c5fd4f2718
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>