Merge "Delete staging directory after creating module package zip" into main...

Merge "Delete staging directory after creating module package zip" into main am: 517308b8 am: 5a5685a6 am: 4ed24d84 am: 8191024e

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



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