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

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

Change-Id: I2fbc5bf453e40e9c1a68349e71308e083dda1130