[automerger skipped] Merge "CSD: fix test after reverting the force MEL flag."...

[automerger skipped] Merge "CSD: fix test after reverting the force MEL flag." into udc-qpr-dev am: 00b7e58a am: 39440eb9 -s ours

am skip reason: Merged-In I53e1bb7b900628e5715beefa2ceee93b299127bc with SHA-1 3144518a is already in history

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



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