Merge "media.bufferpool2: ensure message-ids are safe from overflow/underflow" into main am: 98aba89413

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

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