Merge "[zip] Make implementations of zip interfaces final" am: d0329c51 am: 621a421e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2299823



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