Merge "enforce stricter rules when registering phoneAccounts" into rvc-dev am: 7e58d882

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



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