Settings: Fix broken sliders on menu reset (1/1)

Change-Id: I5a28b1a02a01c8b3d23ab746b1ff5131d2952e6c

Conflicts:

	src/com/android/settings/temasek/quicksettings/QuickSettingsTilesStyle.java

(cherry picked from commit ffb86747fb60bb460f92a0ee5f4a079874084a26)
Settings: Fix up top level "Privacy" section

Change-Id: Id4dbda10a891c793bc6eb3c42807cc0e3f6092cc

Conflicts:

	src/com/android/settings/SecuritySettings.java

(cherry picked from commit 4bb18f5b63b39b430a58eab6274fd626c953090b)