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

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

Change-Id: I4108834d4209d6d1c6f2bf78c3dba23b0d332470