Merge "Better buffer-overrun prevention" into rvc-dev am: d8c535a2 am: 136f9b1d am: 7b9c64f8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/16230693

Change-Id: I5718ffa0f6b07508c0c454eb699e668738e52d92