[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: 68a96d33 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I45cbea7c8f9ff878b592af53b0f506d7c0db7d42