[automerger skipped] enforce stricter rules when registering phoneAccounts am: 6a02885f -s ours am: 675f19f0 -s ours am: 79b91ba6 -s ours am: 94674901 -s ours am: 1991b570 -s ours am: 42f0c61b -s ours am: 7ec5e4a2 -s ours

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

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



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