Merge "Use [clear|restore]CallingIdentity instead of withCleanCallingIdentity" am: a2353ae2ca

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I97202f6832a279896bbcc63043913b35c98589c2