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 am: a4c9a28c am: 0ad4aeec am: c7295df0

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



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