[automerger skipped] Merge "Add support for --replace-version to aapt2" into pi-dev-plus-aosp
am: 0433fc4e98  -s ours

Change-Id: I60236002788bb781ee524b5058761e3c57a622c1