Merge "Replace withCleanCallingIdentity with [clear|restore]CallingIdentity" am: c7906266c5 am: 3b6bae1fee am: aa3bd77f93

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I52549a279f89639ac0132cd1bd1d2a830966eeac