Merge "Merge "AAPT2: Fix processing of quotes in XML" into oc-dr1-dev am: 16cfd497f5  -s ours am: 4dabe266cc" into oc-mr1-dev-plus-aosp