[automerger skipped] Merge "enforce stricter rules when registering phoneAccounts" into sc-dev am: 854dac6da2 -s ours am: 3f0f4123e3 -s ours am: fe459b30f3 -s ours am: b8b17cb4bd -s ours am: 74a2faf503 -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: I69c6221f2ce623d1d0cb34d74d8c848678580986
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>