Merge changes from topic 'am-3f7fb3e7-2ee4-4c8a-97c5-a25336b33653'

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