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

[automerger skipped] Merge "enforce stricter rules when registering phoneAccounts" into sc-dev am: 854dac6d -s ours am: 3f0f4123 -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: Ieb287ac070549f475a0cedd69e38fd8c40d83153
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>