Merge "TIF: fix issue of using caller-aware methods after clearCallingIdentity()" into sc-dev am: a7d0e743 am: 4d16a9af am: 20acba42

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

Change-Id: I4ab281911b0d9aa6412f672de86fc51a76ba20c2