[automerger skipped] Merge "Revert "Escape single quotes in aapt2"" into...

[automerger skipped] Merge "Revert "Escape single quotes in aapt2"" into tm-dev am: d63cdb91 am: d16011d6 am: 546f3f75 am: 0444c3f7 -s ours

am skip reason: Merged-In I775b8a304e76a83934c36886c17cf23560914d21 with SHA-1 49956a73 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18134683



Change-Id: Ia74be1f8041c2b7fb882fe8a6788b9676f9c4207
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>