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: 4d16a9af am: 20acba42 am: c0e30300

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

Change-Id: I1865b415cf0b8a139b63d13dd6dc106a406537af