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: 28486962 am: 1089fca3" into tm-qpr-dev-plus-aosp am: 6dba76ac

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



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