[automerger skipped] Migrate messaging to aapt2. am: a75d7022fc
am: d037073df0  -s ours

Change-Id: I3194bd112e91c694cd4d231a62c36305e396452e