[automerger skipped] Merge "Ensure caller identity is restored in CP quick-path." into rvc-dev am: 978c1ffc3a am: b98ad2ef03 am: bce720fb7d am: 6fde9b397a -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: I1d73ac2f63ae5f21e9cdd3920b9ad1c43e2ddad0