Merge "Replace withCleanCallingIdentity with [clear|restore]CallingIdentity" am: 5b7b782a3b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I376927831333a78dc2c60b5be23324b8f0395c58