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

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

Change-Id: I7cf034e806d74988f3ff2ab43780bbe2f9c3247a