[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 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: Ifbb1bb4e5695163f3184a683a885397ad30840fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>