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

Change-Id: If55ba33179cf84559c206592af0af2487a019b42