[automerger skipped] DO NOT MERGE Correctly reset cross-profile app-op am:...

[automerger skipped] DO NOT MERGE Correctly reset cross-profile app-op am: f764d9e9 am: 2e6c54c2 -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: Ibe6a64e5452e2120806270ebb0ee1a50e3e41793