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: d9a4f0ea

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



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