mainline: fold fix for GKI media config into original patch

Change-Id: I02c8e0dc797e9426c59e2a92bda501d652f64cf0
Cc: Todd Kjos <tkjos@google.com>
Signed-off-by: Matthias Maennich <maennich@google.com>
4 files changed
tree: bdcb6cbc0ae8e2af72db38853bb312ddc15f39b0
  1. android-mainline/