Merge "DO NOT MERGE Bump AOSP Contacts ODR to 1.7.20" into ub-contactsdialer-j-dev