Merge "MediaCodecsXmlParser: append variants instead of replacing" into main am: cf622335cf am: b955cb535c

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

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