[automerger skipped] enforce stricter rules when registering phoneAccounts am:...

[automerger skipped] enforce stricter rules when registering phoneAccounts am: ed52d3a4 -s ours am: 46d1753f -s ours am: e3f9a926 -s ours am: 46e1c45e -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: I2e5345679bca157b46d081b95673b600125d8b8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>