Merge "[automerger skipped] Merge "Pass --legacy to aapt2 compile for...
Merge "[automerger skipped] Merge "Pass --legacy to aapt2 compile for SystemUI" am: 170b0973 am: 67c81ae3 -s ours am skip reason: change_id Ife1b6d77055f5ca3e0b28e8b6b560248b62ad302 with SHA1 80d10305 is in history" into qt-dev-plus-aosp