[automerger skipped] Merge "RESTRICT AUTOMERGE Ensure caller identity is...

[automerger skipped] Merge "RESTRICT AUTOMERGE Ensure caller identity is restored in CP quick-path." into qt-dev am: 76a6546f am: 5a39301c -s ours am: d8c86983 am: 2ba222af am: 0f09d64c

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

Change-Id: Iae8d96aeaa57477be166cd5ecb0065a1aafd8e7a