Merge "Disallow dangerous zip entry names" am: fb6ff598b9 am: e974be93ec am: c0cba4e226

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

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