[automerger skipped] Merge "enforce stricter rules when registering...

[automerger skipped] Merge "enforce stricter rules when registering phoneAccounts" into rvc-dev am: 7e58d882 am: 53a66d76 -s ours am: 064418ad -s ours am: 46a30d4f -s ours am: 6fce1f1b -s ours

am skip reason: Merged-In Ia7d8d00d9de0fb6694ded6a80c40bd55d7fdf7a7 with SHA-1 6a02885f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21119495



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