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

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

Change-Id: I1caa4a4696885ee1914d751093c067fde3d44d38