Merge "Change minSdkVersion of ContactsTests to 21" into nyc-dev