Merge "Use R.txt files from aar files directly" into main am: 4b6a3ae6

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2980833



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