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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2ae6ed673a8c82a7e6326c35c17508d26f2e5236