[automerger skipped] fix the issue that clearCallingIdentity before appops check am: bb73fd0234 am: ea788d0c9d -s ours am: 668944b478 -s ours am: fdc08b7bc8 -s ours

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

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

Change-Id: Iaade3dc04c8671d3bba38f36bf984886cf62852e