[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: 20091364 -s ours am: ee26d693 -s ours

am skip reason: Merged-In I2cfa653e619f522fecdcd01cd080078f6a1ab1f3 with SHA-1 7124a63e is already in history

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

Change-Id: I698a07cfc7af2b4cd41e1d080025fa7b30f6695c