[automerger skipped] Migrate messaging to aapt2. am: a75d7022fc am: d037073df0 -s ours
am: c6bbabd464 -s ours
Change-Id: I964af5abcfa8c0e257f74e8b102add753ad5f46b
This commit is contained in: