DO NOT MERGE Bump up AOSP Contacts version to be 1.6.4.
am: b547dc220d  -s ours

Change-Id: I82887a94c1981b5b0632fa58e137189341c2cba7