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

* commit '4dce3456c7c858d5cec053cfd8a7f8ff2babec1d':
  Completely remove app ops activity.