katstalk/android_packages_apps_ContactsCommon rebase