DO NOT MERGE Change the version of AOSP Contacts to 1.6.12 Bug: 31101408 am: 2165527d91  -s ours
am: 55277fda5f  -s ours

Change-Id: I1f0c94cdddb8fe9d626f1f52bc5f6da0d71d3b05