Merge "Ensure pkg uid matches provided uid for device phone number check" into...

Merge "Ensure pkg uid matches provided uid for device phone number check" into sc-qpr1-dev am: e2ba264d

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

Change-Id: Iede9a11f1e2333eac3c9630e6682d8cbef26c4c0