am 96fdbaa3: am 85eba056: am c5182c9a: Correspond to the security related API change for PreferenceActivity

* commit '96fdbaa367b0bd7d052df48cb7a3197c1a37ac8e':
  Correspond to the security related API change for PreferenceActivity