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 am: 9d58cd9a am: 10799682

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



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