Merge "CSD: fix test after reverting the force MEL flag." into udc-qpr-dev am: 00b7e58a

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



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