Merge "Checking BadOffset while queuing buffers" into main am: 978ed252ea am: 04464a07e0

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3042241

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