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

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

Change-Id: Id57080a930e4457d0d8eb85e2a37bdc4511d48d4