Merge "[DO NOT MERGE] Bumping AOSP Contacts version to 1.4.20" into nyc-mr1-dev