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

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

Change-Id: I915dfa12d0bdcd917e9155199168b57f272b1fff