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

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

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

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