Merge "[DO NOT MERGE] Bump Contacts to 1.4.21 and targetSdkVersion as 24." into nyc-mr1-dev