[automerger skipped] enforce stricter rules when registering phoneAccounts am: 6a02885f90 -s ours am: 675f19f078 -s ours am: 79b91ba6d0 -s ours

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

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

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