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

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