[automerger skipped] Merge "Add support for a hw_timeout_multiplier system...

[automerger skipped] Merge "Add support for a hw_timeout_multiplier system property." am: 59f72059 am: 19995202 am: 8dcea010 -s ours am: 4f4734e1 -s ours

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

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

Change-Id: Ib820aa1c04a1d55e53599d0b7b3c7e80c4a0976b