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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I242abe2597ad717026afc547f05701ed8c41aa5c