[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: 044da5dc -s ours am: 19ddbfd2 -s ours

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

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

Change-Id: I52d5dd42937e6d90f597e89aa07f3b1245d41df5