[automerger skipped] keep a wp<BLASTBufferQueue> in BufferItemConsumer am: b6f8479039 am: 23be1503ba -s ours

am skip reason: Merged-In Iffed80410aeffc9b724d5c01ca2ec589c9622990 with SHA-1 dbca1353f2 is already in history

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

Change-Id: I712c555cc3fb0fafc83c51ee9c7320613375e675