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

[automerger skipped] enforce stricter rules when registering phoneAccounts am: f07776bc am: 97306575 -s ours am: 2f56f525 -s ours am: 9a73e43b -s ours am: 2ec49f4d -s ours am: 711139b7 -s ours am: 95ebcd8d -s ours am: 01ce9a52 -s ours

am skip reason: skipped by user tjstuart

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



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