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

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



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