Merge "DO NOT MERGE Correctly reset cross-profile app-op" into rvc-qpr-dev am: bc8d872805

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib28bc8344587308d096fe929567ffd061144e576