am 8e9ce07b: am a6a6abc8: Fix the security related API change for PreferenceActivity

* commit '8e9ce07b7f93b0dcbe552346b3f040db936a036a':
  Fix the security related API change for PreferenceActivity