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

[automerger skipped] Merge "enforce stricter rules when registering phoneAccounts" into sc-qpr1-dev am: 6f0bdf90 am: 77e50108 am: a4c9a28c am: 202201ae -s ours am: 091a2137 -s ours

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

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



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