TIF: fix issue of using caller-aware methods after clearCallingIdentity() am:...

TIF: fix issue of using caller-aware methods after clearCallingIdentity() am: 05363ef1 am: e55bc915 am: 05d7f90c am: 1ba7b208 am: 7c93ad58 am: 0daba530 am: f2b3f7c0

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

Change-Id: I850b3203fbd62fff0822e35350ebf5f42589f15e