[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 am: d3a4a9d4 -s ours am: a70d9d1d -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: Ide8671128918c918808d69caea4d970416f4f990