Merge "Revert "Escape single quotes in aapt2"" into tm-dev am: d63cdb91

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



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