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

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

Change-Id: I6fe2914be46870bc66b70a858ca106288cf56c0b