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

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



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