DO NOT MERGE Update the AOSP Contacts version code to 1.6.18 Bug: 31101408
am: 1f5db63bad  -s ours

Change-Id: I2f43efa064b42c50c2e6829d1385aca1231e2030