Merge "DO NOT MERGE Bump AOSP Contacts version to 1.5.15" into ub-contactsdialer-f-dev
am: 6e250a0007  -s ours

Change-Id: I77491523184e19506c031210fb9ffbe7804e21d2