Merge "Fix setting the dequeueBuffer timeout to -1" am: 1e0ec09f5e am: c715e51a74 am: 770693f1ac

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

Change-Id: I4dde25ad2dc1d4846a3924aef385726c28cd5d30