Merge "Bump AOSP Contacts version to 2.1.0"