Merge "keep a wp<BLASTBufferQueue> in BufferItemConsumer" am: db8ff29b8f am: 8b1c1d7fc8

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

Change-Id: Ice7c666f952490454e026a323467717166284277