Merge changes from topic "am-016f59e51ec04ddf9a3ffc0b4e415bb9"

* changes:
  Merge changes from topic "am-90e46d830fc648a6b2a77cf23504028f" into android12L-tests-dev am: e43f0449 -s ours
  Merge "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" into android12-tests-dev am: c73206ac -s ours am: 6650bb5f -s ours