Merge "Properly handle wrap system property in zygote" am: c7e5064bcb am: 2d3104f0fa am: 73d67abbdc

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

Change-Id: Ib58b5cf251760e17996893be60c3881504bc520e