[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 skip reason: subject contains skip directive

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

Change-Id: I1d7ec9d5fcdb618c882d9c0a23c1f3b45e98cadb