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

am skip reason: Change-Id I55066cc1de8b820c24faccdfb469377c897e9808 with SHA-1 cf9526cf is in history

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

Change-Id: I88acc06e8fef7f18338e53cf87c99c0f4a6c574a