Merge "Fix memory overflow in ESQueue" into mainline-prod am: 6503362d78

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

Change-Id: Idd026817a251b7624311eb5e30c4993ac3623a21