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

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

Change-Id: I148b4dc71a30c19a9894474293aa68b9d975b111