[automerger skipped] Merge "DO NOT MERGE Correctly reset cross-profile app-op"...

[automerger skipped] Merge "DO NOT MERGE Correctly reset cross-profile app-op" into rvc-qpr-dev am: bc8d8728 am: 653f0781 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icb1f9afa6f3a422fc2f8b6fc399ee760c543889e