Revert "AppOps refactor for mode watchers."

This reverts commit 30342fdad7992356f657f01988243fb3d08cc8d3.

Reason for revert: Verified culprit of b/243320125.

Change-Id: If0045ad856f7519944f89df3f0531ad6d4838b1d
5 files changed