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

* commit '049b948fdb8763704b24e0b6850233ca1d7e95f7':
  Revert "Move AppCompatPreferenceActivity to ContactsCommon"