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 am: c2e6a5cb

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



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