frc_340819030 (10622519,com.google.android.go.media,com.google.android.go.media.swcodec,com.google.android.media,com.google.android.media.swcodec)
Merge sc-mainline-prod

Bug: 189946434
Change-Id: I042f3697acb93059ea10aee2078fd8207cb41c1d