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

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



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