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

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



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