[automerger skipped] Merge "Revert "Do not use unstable Android styable.CheckBoxPreference"" into rvc-dev am: 716816600e -s ours

am skip reason: Change-Id I60a9c975f92cbe805f21d634db93a193a524dc08 with SHA-1 92ea32d972 is in history

Change-Id: I83de16435392c775e3aea248476a8e890f39a223