Refactor: Group AppOps related info together am: 5aabbae3c6

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

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