Merge "DO NOT MERGE Bump AOSP Contacts ODR to 1.7.20" into ub-contactsdialer-j-dev
am: 2b254a4b01  -s ours

Change-Id: I534d267a54a6d3b1119fb1eec8c31bb585fc8346