TIF: fix issue of using caller-aware methods after clearCallingIdentity() am: 05363ef193 am: e55bc91578

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

Change-Id: Ifde0bb94cabf013af3fd1d0a63e3b514b12558fe