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

[automerger skipped] Merge "enforce stricter rules when registering phoneAccounts" into rvc-dev am: 06920b60 am: 1c0c5632 -s ours am: 194d7f4b -s ours am: 48f88f05 -s ours am: 0e0ae89a -s ours am: f1e513f4 -s ours am: b6930025 -s ours

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

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



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