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

Change-Id: I32f907622d5c1c7b2fc22892df445d32fe802e05