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