Merge "Add SettingsMultiSelectListPreference style DO NOT MERGE" am: 8378efc6af  -s ours
am: 942249a2dd  -s ours

Change-Id: I23af2770255199348eaa8c69d990ff2907ff90de