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

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

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



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