[automerger skipped] Merge "Ensure caller identity is restored in CP quick-path." into rvc-dev am: 978c1ffc3a am: af75df0bf7 -s ours

am skip reason: Change-Id I69d5c792cf442e694a5b5ab15ce5913279a5545a with SHA-1 60e77bb034 is in history

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

Change-Id: I6685d26e8d0202486931622f0745b9145bfd079e