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 am: 8a63377e

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

Change-Id: If3803fb52c9346f6b003b5972b6fb9b289ddb28a