Merge "Ensure outputs correctly declared for proguard config in R8" am: 1f65e0d0 am: efa772bd

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



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