Bug: 241448326 Test: verified on device, atest MediaOutputAdapterTest Change-Id: I5d2ab2e1a6cb8341871305a729d8584ca15c4dcc (cherry picked from commit 9673316c)