Merge changes from topic "bufferpool2-V2" into main am: 04b5d667 am: 1b909f48

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2906625



Change-Id: I9ca93d8c70506d0326f30b071b5cfe7f264ca715
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>