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

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

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

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