[automerger skipped] Camera: Don't drop preview buffers during video am: f20dd6b779
am: d16cbe1e18  -s ours

Change-Id: I3ebc65de54ae4827f7ad2a4d584ff0ede0fa8518