Revert "Refactor: Group AppOps related info together"

Revert submission 27392016-cherrypick-AppOpsController-AppOps-w48m53c1or

Reason for revert: <Potential culprit for b/341210811- verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.>

Reverted changes: /q/submissionid:27392016-cherrypick-AppOpsController-AppOps-w48m53c1or

Change-Id: I836180b00d88f995c2d69df54991c2d8edaa94b7
4 files changed