Merge tag 'android-4.3_r2.2' of https://android.googlesource.com/platform/packages/apps/Settings into cm-10.2

Android 4.3 release 2.2

Change-Id: I6a5876c5af7275a693ea0ccb17e8e64922381754

Conflicts:
	res/values-es/strings.xml
	res/values-it/strings.xml
	res/values-pt/strings.xml
	res/values/strings.xml
HALO Mods (2/2)
    * Animation controls

[part 1 in android_frameworks_base]
Add instance save/restore for hardware tunables.

Needed to correctly handle e.g. screen rotation.

Change-Id: I6c4ba9aa24c9545037f949a68654428457de46f5
Revert "Fix coding style."

This reverts commit 42b1727b5268363659ea1d8843452a33dc1f7c7b.

Change-Id: Ie8feb9dba61ce5cc263e4b09e063e0cd00ecdbe9
Revert "Bluetooth : Remove out of range devices after ScanComplete"

Reverting this change as it has some side effects and after
removing this gerrit the behavior is like commercial phone.

This reverts commit 2ba08f2d7efbfe7c0b0080f0e9a63e56d15695e7.

Change-Id: Ice89ccb6250f55f4e0235df27a3ecea64260b488
Just in case