Merge " DO NOT MERGE Change the version of AOSP Contacts to 1.6.11 Bug: 31101408" into ub-contactsdialer-h-dev