[automerger skipped] Merge "aapt2: Add command to rename overlay...
[automerger skipped] Merge "aapt2: Add command to rename overlay "targetPackage" attribute" am: 1e590bf8 am: f471241f -s ours
am skip reason: Change-Id I556fc11e271337de40c70d4ed56a0381a2f79712 with SHA-1 ae12ce41 is in history
Change-Id: I034502434847b0f0eb4f609e7f62e5d9c9b5f8a5