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

Merge "Handle next segment wraparound gracefully" into tm-dev am: 2ea87cb7 am: ec160cbb am: ae8c0c06 am: 5a2ae6f5

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



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