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
am: 7f898af  -s ours

* commit '7f898af31915365d78b029325360335ea81ced31':