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

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1628803

Change-Id: I05c9e3be1f093110b83c14d6458be35b84214e48