Merge "Use q launch defaults for dcla for com.android.media and...

Merge "Use q launch defaults for dcla for com.android.media and com.android.media.swcodec." am: 61c04107

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



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