am 870b79b8: Merge "Fix CTS test failure due to new PreferenceActivity API in KK" into klp-dev

* commit '870b79b83caa283cfab21c02fa9d4c269249b58c':
  Fix CTS test failure due to new PreferenceActivity API in KK