Merge "Replace withCleanCallingIdentity with [clear|restore]CallingIdentity" am: 7a8259c987

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If1af526cf485a659f96561c7e8e8f56d5eb84e56