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