Merge "dalvik sysprop settings are optional" am: 98b7b0390e

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1346182

Change-Id: Ic9389362af4388e0d8f15701bd066f26ec60838e