am 034b83e8: Reconcile with AOSP jb-mr2-dev - do not merge

* commit '034b83e8668a0b26d1eccfc9fa433b8eae3e50a8':
  Completely remove app ops activity.