[automerger skipped] enforce stricter rules when registering phoneAccounts am: ed52d3a488 -s ours am: 46d1753fac -s ours am: e3f9a92643 -s ours am: 46e1c45e51 -s ours am: 82386951d3 -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: I7ad8f05ccacc9140268b34574af7fe22f58659e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>