Merge "Properly handle wrap system property in zygote" am: c7e5064bcb

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

Change-Id: Ic0dd461c674d0b40b5fb3228548bc37fd2fc3525