DO NOT MERGE Bump version of AOSP Contacts to 1.6.20
am: bcc69bd23a  -s ours

Change-Id: Ibc2e41235da59e13c06cb857109a639d6d976064