Merge "TIF: fix issue of using caller-aware methods after...

Merge "TIF: fix issue of using caller-aware methods after clearCallingIdentity()" into sc-dev am: a7d0e743 am: 5d490b5e

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

Change-Id: I93a93df3ae76493a03c8fd34b92134c75c46bf00