Revert "Move AppCompatPreferenceActivity to ContactsCommon" am: 8a95000248
am: 1143e19b38

* commit '1143e19b381fe8e9d4b509dfceacecb6ce47e4b0':
  Revert "Move AppCompatPreferenceActivity to ContactsCommon"