[automerger skipped] Merge "Move initZipPathValidator() into ActivityThread"...

[automerger skipped] Merge "Move initZipPathValidator() into ActivityThread" am: ceb138df am: 760d2d17 am: c498273f -s ours am: 52d7c5c1 -s ours

am skip reason: Merged-In I539465d818e78a7f1dd4dddbe345331836e09caf with SHA-1 b49caa85 is already in history

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



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