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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556750

Change-Id: Ib94341545c598c45e9fcbfdca61459168fa9905c