TIF: fix issue of using caller-aware methods after clearCallingIdentity() am: 05363ef193 am: e55bc91578 am: 05d7f90c41 am: 1ba7b208c6 am: 53d4a43fac am: b4bd7095e9 am: 022ef5ff23

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

Change-Id: Ifead1f4fe7f7879c7481eeaa36ea9860c70f55a8