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

* commit '88406020e6c981d13984779eb5b792f50b909e17':
  [DO NOT MERGE] Bump Contacts to 1.4.21 and targetSdkVersion as 24.

Change-Id: I01013306544a00fa54aae50a97bce8579ee61cf9