TIF: fix issue of using caller-aware methods after clearCallingIdentity() am:...

TIF: fix issue of using caller-aware methods after clearCallingIdentity() am: 05363ef1 am: e55bc915 am: 05d7f90c am: 1ba7b208 am: 53d4a43f am: b4bd7095 am: 022ef5ff am: 84b8533b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15752564

Change-Id: If796eb174d4a9f73d0c1bab859fb9855f60b827c