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

[automerger skipped] Merge "enforce stricter rules when registering phoneAccounts" into tm-dev am: 84d90365 -s ours am: ee1781d3 -s ours

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

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



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