Merge "Replace withCleanCallingIdentity with [clear|restore]CallingIdentity" am: aaef65de42 am: 3d4e6deeb3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I242abe2597ad717026afc547f05701ed8c41aa5c
tree: af2b1bd70d531ab15aa43ad81cf6f61241a0d8c0
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS