[automerger skipped] dalvik sysprop settings are optional am: e3668e11 am:...

[automerger skipped] dalvik sysprop settings are optional am: e3668e11 am: 4129574a am: d5ad8ee4 -s ours

am skip reason: Change-Id Ia3528c0c2f9715ff10b85b549d739c9263ab6a7e with SHA-1 04f86d1c is in history

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

Change-Id: I62c7d90d1b5928d33cd620ebf3edb89e76cd1b9d