Merge "Refactor package_outputs" into main am: b5484c4b

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



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