Merge "media.bufferpool2: ensure message-ids are safe from overflow/underflow"...

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

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



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