Merge "[DO NOT MERGE] Bump Contacts to 1.4.21 and targetSdkVersion as 24."...
Merge "[DO NOT MERGE] Bump Contacts to 1.4.21 and targetSdkVersion as 24." into nyc-mr1-dev am: 88406020
am: 8efc786a -s ours
* commit '8efc786a':
[DO NOT MERGE] Bump Contacts to 1.4.21 and targetSdkVersion as 24.
Change-Id: Iea1f591a90a2bf93f0f36112c0c009cced26cf62