Merge "Ensure pkg uid matches provided uid for device phone number check" into sc-qpr1-dev am: e2ba264dd0 am: 8b4e23ecf5 am: 01d849d74b

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

Change-Id: Ib5905258c43b943b287eaa5326aecf40c40f97cf