DO NOT MERGE Update AOSP contacts to 1.6.13 Bug: 31101408
am: 3e3c53182b  -s ours

Change-Id: I8f4aa7166b975acdce0f3c7dd97fe59b14bb0ccc