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

[automerger skipped] Merge "dalvik sysprop settings are optional" am: 98b7b039 am: dca68607 -s ours am: fc474209 -s ours

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

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

Change-Id: I88c3e30c1fb64da4b373d2044aae9daf4046538d