Merge "Revert "Move AppCompatPreferenceActivity to ContactsCommon"" into ub-contactsdialer-b-dev
am: fc37a45afa

* commit 'fc37a45afae5092f0d0ddb2ff515ec71da9e361e':
  Revert "Move AppCompatPreferenceActivity to ContactsCommon"