Merge changes from topic "am-c26f0ad562254f018dec45fde6f135ec" into...

Merge changes from topic "am-c26f0ad562254f018dec45fde6f135ec" into tm-d1-dev-plus-aosp am: d6b3e903 -s ours

am skip reason: Merged-In If9ecf3a243dcbf827b8b24f8abd9ae90fc41ba46 with SHA-1 1f1b7aa4 is already in history

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



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