Merge "Check callingpackage to be consistent with callingUid" into sc-dev am: 3d2af9b0e7 am: 4ab288a853 am: 4c55d97b67

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/15364010

Change-Id: I8902938feebf63fe580137a1451a32201d99921b