[automerger skipped] Merge "Add --rename-resources-package to aapt2" am:...

[automerger skipped] Merge "Add --rename-resources-package to aapt2" am: 439ac26e am: e8d9ac47 -s ours am: 385ffb6a -s ours am: 5f1c5621 -s ours am: 29969c53 -s ours

am skip reason: Change-Id I435ba07e29df0522c3a44cc5f2c460004a02d71c with SHA-1 60b74fb4 is in history

Change-Id: Ifede7400518d6c60f0d75069b2dbda686cdccfaf