TIF: fix issue of using caller-aware methods after clearCallingIdentity() am: 05363ef193 am: e55bc91578 am: 05d7f90c41 am: 1ba7b208c6 am: 7c93ad5848 am: 0daba53082 am: 7fd04764a9 am: 4cd54e216f

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

Change-Id: If5cd158ddd36bd5b26d043a49c2a26f067c687bd