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

Change-Id: Ic3274cd389282ac819d41830fa907d7fcf9ddb61