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

[automerger skipped] fix the issue that clearCallingIdentity before appops check am: 02bb0cc3 am: 2eafab7b -s ours am: 217b528d -s ours am: d90791ab -s ours am: efa1edb0 -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: I8c489c6990e9865e61ed5e45746aa9b3c37a9c2d