Merge "Revert "Do not use unstable Android styable.CheckBoxPreference"" am: c15b81eaad am: 762a29b3ae

Change-Id: I8b23e81014bdf67bd4a79d76ed98ebb25e76e8d7