Disable AppOps for real.

Change-Id: I1a952dfd2b32566c2f64367dd9698a94410ec7c1

Conflicts:
	AndroidManifest.xml
settings catapillar ~> settings butterfly

Cherry-picking from all the F over has caused a lot of inconsistency
in our settings.  This should take care of most of it.

fix settings without summaries when their buddies had summaries
organize sound settings & segregate summary vs non-summary
add summary updater for emergancy tones on CDMA phones
actually remove tablet statusbar from phones
remove torch if there's no flash
fix up context leaks in various settings classes
capitalization consistency
move some hardcoded strings in arrays to @string/
move quickpinunlock to security settings since you have to go there first

TO DO after 4.4:
   performance settings rewrite
   move more hardcoded strings from arrays
   move custom setting strings to @vanir/ for future translation (CM)
   find out what the fck "Hide Extras" actually does
   add generic menu header for aftermarket launchers on main layout
   add image on top of vanir customization??

Change-Id: Idcdc8f62e2fb35cdab78d3693f3098a726268332
Merge tag 'android-4.3.1_r1' into HEAD

Android 4.3.1 Release 1
Bluetooth: Remove out of range devices after ScanComplete

Change to remove device from UI when Bluetooth of remote
device is off or not discoverable anymore. Without this
change a device that discovered previously is available
in available devices list always, though the remote device
is not discoverable anymore. The current change updates
available devices list on scan complete removing the
devices that are available in cached devices and are not
disvorable anymore.

This reverts commit 1b652eb600ad7b4a769ad495bbb7eb4c6ab82fb2.

CRs-Fixed: 523374
Change-Id: Ia250d52e6fb7a69af242c961d33027f1e724ab25
Bluetooth: Security: Add Null check during pairing cancel intent.

Added null check, so before posing event we can restrict events,
if cached device list is empty

Change-Id: I458d181abe5eec2497b80b1713ddbc3502b79786
CRs-Fixed: 546364