Merge "DO NOT MERGE Update AOSP contacts to 1.6.13 Bug: 31101408" into ub-contactsdialer-h-dev