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

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

Change-Id: I69ee7cf8bcd7956d5b7edf46594e1cfc531d4e2e