Merge "Properly handle wrap system property in zygote" am: c7e5064b am:...

Merge "Properly handle wrap system property in zygote" am: c7e5064b am: 2d3104f0 am: 73d67abb am: 613947b9

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

Change-Id: Ia97b2985f044b863bec6e7cd79e37a077b73099b