[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: fdc08b7b -s ours am: d23f5394 -s ours am: c4c71513 -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: I0cdf3b967245c23d71b32355c56d34df1c0859b6