[automerger skipped] Reapply "Migrate AppOps" am: 7a8d8fd091 -s ours
am skip reason: Merged-In I000274ae9c725f848e1c8910120ba886fcc5be95 with SHA-1 fb48926fe8 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27410054
Change-Id: I28b237c8e894b89faab5e90bd426e8a226cc56e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: