Revert "BT: Multi HF support in Settings App."

This reverts commit 7bbd90528064516a4aae200731a7fd60acd09192.
ImmersiveDesktop: fix potential arrayoutofbounds index with 'smartsummary'

final string strValueMode is set before setImmersiveModeEntries() modifies the
available entries in the listpreference array.  After setImmersiveModeEntries()
is called smartsummary uses strValueMode to set the summary.

Change-Id: I64b6032d809bb1f442a085c70f93e61b827bdb41
Merge "ImmersiveDesktop: fix potential arrayoutofbounds index with 'smartsummary'" into kk44
Settings: Remove Wallpaper selection from Display

Let the launcher handle wallpaper selection.

Change-Id: I7f0eb20a5bc01d82fdb98905524b9743fee447c6
Signed-off-by: Roman Birg <roman@cyngn.com>
Merge remote-tracking branch 'cm/cm-11.0' into HEAD
Merge pull request #1 from VanirAOSP/kk44

merge vanir upstream changes