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

* commit '136059f118b580a3dc8f3023d1d19c8c56020a01':
  Revert "Completely remove app ops activity."