[automerger skipped] Migrate Contacts app to aapt2 am: 823c1cf0fd
am: ea3b5e3210  -s ours

Change-Id: I87bff790ecd972468dd6295819aef621ae59b82b