[automerger skipped] enforce stricter rules when registering phoneAccounts am: b07326f1 -s ours am: 2bf3ba21 -s ours am: a80aa564 -s ours am: f92dbc1d -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: If7d1f4faf1578fe360268fee61bdbc98403c7bcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>