[automerger skipped] Merge "keep a wp<BLASTBufferQueue> in BufferItemConsumer" am: db8ff29b8f am: 8b1c1d7fc8 am: f468278df8 -s ours am: 039ee4d203 -s ours

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

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

Change-Id: I60df6bd39e52df552ce5c87138683f43ee944fcd