Moved android_packages_apps_Contacts Upstream