[automerger skipped] Merge "Increase dequeueBuffer timeout"
am: 6e1e6fd699 -s ours
am skip reason: change_id Ic4fae04b41f71600479f9557e334f67c27851db4 with SHA1 3f333d6d72 is in history

Change-Id: Id0fa243e39aabd45b31f8a3bfa40f9f4242ec2a6