[automerger skipped] enforce stricter rules when registering phoneAccounts am: f07776bc am: 97306575 -s ours am: 2f56f525 -s ours am: 92d91baf -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: Ib99833f821e60d99871875713c139f32a658f5c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>