clean up stains

rebase
Change-Id: I11f4439802884acb761bc291d28dc81520e8f441
Revert "Completely remove app ops activity."

This reverts commit c8ee999b9df706209aeb1f230574131a032fef27.

Change-Id: I0d0078f7e37717952fe48ec4b5024e75cc5af6bb
Merge "Revert "Completely remove app ops activity."" into jb43