Merge "Ensure caller identity is restored in CP quick-path." into rvc-dev am: 978c1ffc3a

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

Change-Id: I25bec816043d02d8a0279fffaa796c9096d2dfd6