Merge branch 'ub-contactsdialer-master-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Contacts into ub-contactsdialer-master-dev