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