am f46449ab: Merge "Avoid IllegalArgumentException in Preference.java compareTo()"

* commit 'f46449abedcba2167fffa8ba8dc2f6d7a6d410b9':
  Avoid IllegalArgumentException in Preference.java compareTo()