Merge "Add component-tag and audio-description support" am: 9c727ebf am:...

Merge "Add component-tag and audio-description support" am: 9c727ebf am: d5675dba am: ff612546 am: 9fdc051f

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



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