[automerger skipped] Merge "Add support for --replace-version to aapt2" am: 186be90eb6
am: 5c0601d65a  -s ours

Change-Id: I7614f591744a46274e657f38dcf9ee364c274d1a