Squashed revert of AppOps until gapps SetupWizard doesn't explode

Change-Id: Ifd3c31f4af2659515cf6151047c7ebaf2f0965d9