am 7b470340: am 83994ad6: Merge "Fix the security related API change for PreferenceActivity"
* commit '7b4703402e2cc999a20fc3f40eb165a0c6cc2da9': Fix the security related API change for PreferenceActivitymain
commit
776e81be37
* commit '7b4703402e2cc999a20fc3f40eb165a0c6cc2da9': Fix the security related API change for PreferenceActivitymain