Merge "Handle next segment wraparound gracefully" into tm-dev am: 2ea87cb7...

Merge "Handle next segment wraparound gracefully" into tm-dev am: 2ea87cb7 am: fafb2c9b am: 7ad8d2aa am: 8c4d5bb2

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



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