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

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

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