Merge "[aapt2] Allow multi-line argument files" into main am: 438d2e20fd am: ca05a906a7

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

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