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 am: 50807b26

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

Change-Id: Ide74e5a40d71cfda7bc501003659403acfebb799