[automerger skipped] Merge "Parse dalvik.vm.ps-min-save-period-ms property"...

[automerger skipped] Merge "Parse dalvik.vm.ps-min-save-period-ms property" into sc-dev am: f7730d7e -s ours

am skip reason: Merged-In I2f30675b335ca0b9b1f1d30144fcdfa4fc680b41 with SHA-1 a2ba369d is already in history

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

Change-Id: Iaf47f855c2e02ced1216bc4e9cd1c079dd6428b2