Merge "Reduce timeouts for occasionally-stalling sections" am: 0ac5e458cf am: 251493d8fc am: 304a97ce94 am: 33b5aae651

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

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