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

[automerger skipped] fix the issue that clearCallingIdentity before appops check am: bb73fd02 am: ea788d0c -s ours am: 668944b4 -s ours am: 9d45fe38 -s ours am: 14362781 -s ours am: efd098a4 -s ours am: 67ac0e79 -s ours

am skip reason: Merged-In Id0abfee602823f56811799a6d5c2bbe8cd5e2cc1 with SHA-1 02bb0cc3 is already in history

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

Change-Id: I882b00f4e40959b5b488e1565a3c34fadd832f18