Squashed revert of AppOps until gapps SetupWizard behaves

Change-Id: I826599864c541071e60412a51f9d8e910a2e5f9a