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

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



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