Merge "DO NOT MERGE Update AOSP contacts to 1.6.13 Bug: 31101408" into ub-contactsdialer-h-dev
am: 6fcb800170  -s ours

Change-Id: Ia15df5b17f348d272ba70ff4edc07ee0257fe255