Merge "Add support for a hw_timeout_multiplier system property." am: d9bb7106bc

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1629766

Change-Id: I52796e1b50b057f5d726be48c327404fdde0e5ee