tree 0c0c8cd78fd603b6fbccf76a90afddfa7ed66a5b
parent 656bab2efbe889c8bd0c91ea16d54a756bab73b1
author Chen Xu <fionaxu@google.com> 1624558080 -0700
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1628902718 +0000

fix the issue that clearCallingIdentity before appops check

we should restore CallingIndentity when do the appops check for
access device/subscriber identifier

Bug: 187147737
Bug: 183612370
Test: Manual test
Change-Id: Id0abfee602823f56811799a6d5c2bbe8cd5e2cc1
(cherry picked from commit 020d831ced2393aca3b51eb2a9fb805f5757fd87)
Merged-in: Id0abfee602823f56811799a6d5c2bbe8cd5e2cc1
(cherry picked from commit 5fc2375db75129ac458a618c35ede8fb045976c4)