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 am: 3b80e6bf

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

Change-Id: If9eede2d190e68e4b60c40cd5a7bfb41e5d8e2a4