[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: 84674383 -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: I0cba99b75cd520b8baea8a8102d43f6cbea752d5