Merge "RESTRICT AUTOMERGE Ensure caller identity is restored in CP quick-path." into qt-dev am: 76a6546f5a

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

Change-Id: Iacb83439a9e2f8647f088ab1387eb332c3a8c6a7