[automerger skipped] enforce stricter rules when registering phoneAccounts am: 643089ac49 -s ours am: 8c2581a631 -s ours am: 553c4b6fba -s ours am: ca41c66d02 -s ours am: 0198c823b3 -s ours am: d58efbfa15 -s ours

am skip reason: Merged-In I5eb2a127a44d5ec725d0ba39cb0ef478b12013de with SHA-1 f07776bc42 is already in history

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

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