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