DO NOT MERGE Bump AOSP Contacts ODR to 1.7.20 skipped: c8aabe861e

Change-Id: I16bc1169ef81bb1a4401cce14dc6b9fa61073991