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