[automerger skipped] Merge "enforce stricter rules when registering phoneAccounts" into tm-dev am: 84d903652d -s ours am: d2cb926d84 -s ours am: a16bb3b111 -s ours am: 8670b3432e -s ours am: d9c9ac90ed -s ours
am skip reason: Merged-In Ia7d8d00d9de0fb6694ded6a80c40bd55d7fdf7a7 with SHA-1 a66a3156e0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21649216
Change-Id: I3c6432cb459e8170e54c97a6c5457fccaa5e9235
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: