Merge "Allow to disable buffer dropping from BufferQueueProducer am: 6ce715b696 am: 79d3d51b74" into qt-r1-dev-plus-aosp
am: bd1756ea2f

Change-Id: I2886b90f8ca69830a20816cbfc30de190a783b99