Merge "Better buffer-overrun prevention" into rvc-dev am: d8c535a29f am: 136f9b1d8b am: 7b9c64f8df

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

Change-Id: I8237d7191a6e6d14701b3afc5443afcaf8bf613f