Merge "Check callingpackage to be consistent with callingUid" into sc-dev am: 3d2af9b0e7 am: 4523585c9f am: 1cb8b20069 am: 6cad530628

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

Change-Id: Ia9a819f23335b20e1f38cf739e01148141be663f