Merge "Enable referencing of aapt-generated proguard flags" am: 7fecde90 am:...

Merge "Enable referencing of aapt-generated proguard flags" am: 7fecde90 am: dd1a7fff am: 543d28cb am: f52900d6 am: 8706a284

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



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