[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 skip reason: Change-Id I435ba07e29df0522c3a44cc5f2c460004a02d71c with SHA-1 60b74fb4 is in history
Change-Id: Ic335061a3c467c93cebc8222cb1cb4edeb7f3b82