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

[automerger skipped] Merge "Add support for a hw_timeout_multiplier system property." am: 7fe1ca63 am: 3c8dbe30 am: 1dec957d -s ours

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

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

Change-Id: Idd995acc5140d0bef5dce840cc3e0173a70efb01