[automerger skipped] Merge "Default to AAPT2 = false in AOSP only" am: 6146e28628 am: 5eca469669  -s ours
am: 66cac57064  -s ours

Change-Id: I224ae1137ac2c9cafe0301ca3648cab7a6dd3347