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

[automerger skipped] Merge "enforce stricter rules when registering phoneAccounts" into tm-dev am: 080d96aa -s ours am: 64374c4d -s ours am: 97944df4 -s ours am: 588f0856 -s ours

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

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



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