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

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

Change-Id: I570d84af5e8d7b46edc047b52d15b03c5acac4c6