[automerger skipped] fix the issue that clearCallingIdentity before appops...

[automerger skipped] fix the issue that clearCallingIdentity before appops check am: 02bb0cc3 -s ours am: be626670 -s ours am: 6c5a804c -s ours am: fc955c1a -s ours am: b6231879 -s ours

am skip reason: Merged-In Id0abfee602823f56811799a6d5c2bbe8cd5e2cc1 with SHA-1 5fc2375d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/15462893

Change-Id: I36387d2b4d0c31a8988fe9bb8b60541f39114c7d