Revert "Move AppCompatPreferenceActivity to ContactsCommon"
am: 8a95000248

* commit '8a95000248c75c2d4534cf6e18c42b30da54f9e5':
  Revert "Move AppCompatPreferenceActivity to ContactsCommon"