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

Change-Id: I48f49a8d03a6d4d8c325e8cbb1fcf2272d33c8e6