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

[automerger skipped] fix the issue that clearCallingIdentity before appops check am: 5fc2375d -s ours am: c73e9924 -s ours am: 342d4b95 -s ours am: bd5354f1 -s ours

am skip reason: Merged-In Id0abfee602823f56811799a6d5c2bbe8cd5e2cc1 with SHA-1 020d831c is already in history

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

Change-Id: I9009314660f3762a2b7fbc1400670142e5dbc823