[automerger skipped] Merge "Add support for a hw_timeout_multiplier system property." am: d9bb7106 am: a05a1986 am: 4c8a2444 -s ours

am skip reason: skip tag Change-Id I6d7710beed0c4c5b1720e74e7abe3a586778c678 with SHA-1 0b174f7f is already in history

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

Change-Id: Ic692891f63e5870633d77b34c4361714db0db5cb