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: 1214ca3

* commit '1214ca3d1c7c20dbb487bc310f1dcd1f3534277d':