[automerger skipped] Merge "enforce stricter rules when registering phoneAccounts" into sc-dev am: 73e5e061b1 -s ours am: fbaaa24d3a -s ours am: 6b5d57fd63 -s ours am: 4161f896f1 -s ours

am skip reason: Merged-In Ibbc7e87d4137a138e09a02a0c36037b6a44820e5 with SHA-1 461d139b22 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/21184480

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