[automerger skipped] Reapply "Refactor: Group AppOps related info together" am: 3f5e03ed -s ours

am skip reason: Merged-In I9270bc7468a4f2ace35af040d341b56264e8bfbd with SHA-1 84b5ecad is already in history

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



Change-Id: If8a6d3589bc17e0bd5211eb6f163ab5af79534c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>