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

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

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