Merge "Fix Out of Bounds read in TextDescriptions.cpp am: b63d4e78 am:...

Merge "Fix Out of Bounds read in TextDescriptions.cpp am: b63d4e78 am: a18815ba am: d8dad277 am: 4803c5c3 am: e7caf5cd am: 9850bfbc am: e449edb2" into tm-d1-dev-plus-aosp am: 4c2fb0de

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



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