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

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

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