DO NOT MERGE Bump version of AOSP Contacts to 1.6.17
am: 06f023b2b9  -s ours

Change-Id: Ice0c5ff243ea3c58ac84177f2e9b0545fff59c58