Revert to b121582ced0de372ff18a716a63c2dacc1bc685b

Change-Id: I329041b38fbefa85a7fa2d9705225cb79f5f4aa0
Merge branch 'tu2' of https://github.com/flappjaxxx/platform_packages_apps_contacts into tu2