[automerger skipped] Merge "Migrate UnifiedEmail to AAPT2." am: c94fdd9ca7
am: d0e5660500  -s ours

Change-Id: I0a939cc905f8019c670676371152ce66be8bb682