Merge "Reset permissions after unzipping jars" am: bcabb923 am: 82a15e77 am: c28d4311

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



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