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

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

Change-Id: I2caf7bad9da7eb4ec42b7be83b97053a05194cb6