Revert "Completely remove app ops activity."

This reverts commit 1ad26e9c370e3db3ac801bda42b3fa52ab2e2d07.

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

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

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

This reverts commit 1ad26e9c370e3db3ac801bda42b3fa52ab2e2d07.

Change-Id: I58b5ea280ed0dbff00f7f6f98fbd41575cdd5222
Adds a base class for restricted settings

Creates an easy way to ask for the restriction pin before
allowing access to a settings page.  Does this to the WiFiSettings.

Change-Id: I49734f66e09b6449596412ecf6fc1113bf57ce7f
Merge "Adds a base class for restricted settings"
am ca1b7458: Completely remove app ops activity.

* commit 'ca1b7458244191214172009d21eae2d04b6992f9':
  Completely remove app ops activity.
Completely remove app ops activity.

Change-Id: Ibe2f15c9ff7589fd5527a0f249d7c1eeca868c8a
Reconcile with AOSP jb-mr2-dev - do not merge
Merge commit '0b849a70'

Resolve conflict.

Conflicts:
	AndroidManifest.xml
am 45d4dce2: (-s ours) am ca1b7458: Completely remove app ops activity.

* commit '45d4dce29eea9fd503b15aedf4f63e38bf5fb0d7':
  Completely remove app ops activity.
Added UI widgets for new location settings page

Change-Id: I87eee999a4dd0189609f58d6f3e4ffe517d63a0e
Merge "Added UI widgets for new location settings page"
am 034b83e8: Reconcile with AOSP jb-mr2-dev - do not merge

* commit '034b83e8668a0b26d1eccfc9fa433b8eae3e50a8':
  Completely remove app ops activity.
am 4dce3456: am 034b83e8: Reconcile with AOSP jb-mr2-dev - do not merge

* commit '4dce3456c7c858d5cec053cfd8a7f8ff2babec1d':
  Completely remove app ops activity.
am a43e2701: (-s ours) am 4dce3456: am 034b83e8: Reconcile with AOSP jb-mr2-dev - do not merge

* commit 'a43e27016410910e9d11c09e981e58743ee9439e':
  Completely remove app ops activity.
Add secure overlay displays in developer options.

Change-Id: I16fb0429de42443a95e8dfd03382bf8e0c2a6bb7
Reset app preferences now resets all app ops.

Change-Id: I7966245b5f322f55e139b2da661c02cd58530f11
am a6683e0f: Reset app preferences now resets all app ops.

* commit 'a6683e0f4af75005ab5a1742d30df4bee071f725':
  Reset app preferences now resets all app ops.