[automerger skipped] Merge "enforce stricter rules when registering phoneAccounts" into rvc-dev am: 06920b605c am: 1c0c56328a -s ours am: 194d7f4b54 -s ours am: 48f88f0544 -s ours am: 0e0ae89ad4 -s ours

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

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

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