TIF: fix issue of using caller-aware methods after clearCallingIdentity() am: 05363ef193 am: e55bc91578 am: 05d7f90c41 am: 1ba7b208c6 am: 7c93ad5848

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

Change-Id: I5f3e67ff9f612d428aa02bfa9be2fdab6379bd3e