Merge "Add component-tag and audio-description support" am: 9c727ebf16 am: d5675dba7c am: ff612546a5

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

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