Merge "enforce stricter rules when registering phoneAccounts" into sc-qpr1-dev...

Merge "enforce stricter rules when registering phoneAccounts" into sc-qpr1-dev am: 6f0bdf90 am: 77e50108

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



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