[automerger skipped] Merge "Add callingPackage checking with uid in...

[automerger skipped] Merge "Add callingPackage checking with uid in getPhoneAccount method in Telecom" into sc-v2-dev am: ce7dcca0 -s ours am: e467fbb0 -s ours

am skip reason: Merged-In I98ac5765167599f97589e60b727929bb11c6014c with SHA-1 40910010 is already in history

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

Change-Id: I02b80107f631cdeb85530275eb59b61e82208805