Merge "Reduce timeouts for occasionally-stalling sections" am: 0ac5e458 am:...

Merge "Reduce timeouts for occasionally-stalling sections" am: 0ac5e458 am: 251493d8 am: 304a97ce

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



Change-Id: I0b2a47df5580eaaf4b2f5589b7536c2a54ecce68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>