[automerger skipped] enforce stricter rules when registering phoneAccounts am: ed52d3a488 -s ours

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

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

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