DO NOT MERGE Change the version of AOSP Contacts to 1.6.11 Bug: 31101408
am: a19eef1db7  -s ours

Change-Id: I6507d74823d83b421278ac62f5da963c79416300