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

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

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