[automerger skipped] Merge "enforce stricter rules when registering phoneAccounts" into rvc-dev am: 7e58d882e3 am: 53a66d769a -s ours am: 064418ad7b -s ours am: 46a30d4f6a -s ours

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

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

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