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

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



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