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

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