am 1a32d477: am 136059f1: Merge "Revert "Completely remove app ops activity."" into jb-mr2-dev

* commit '1a32d477934399ca5331863fe17651c1dbf165b8':
  Revert "Completely remove app ops activity."