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: I9561c3d4e26c94762002690e7c2cdc10b4147cdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>