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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I50c09f6f06ea624a44353f0a7870bd500a387eca