Merge "[automerger skipped] Merge "Add sub-elements for "Variant" type" into...

Merge "[automerger skipped] Merge "Add sub-elements for "Variant" type" into android10-tests-dev am: 5c124b62 -s ours" into android11-tests-dev am: a8cc070f -s ours

am skip reason: Merged-In I55066cc1de8b820c24faccdfb469377c897e9808 with SHA-1 cf9526cf is already in history

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

Change-Id: Idb583ce23b7424c492cf1e3c391942ec9fa34f45