Merge "Fix wrong metadata conversion in MediaSessionLegacyHelper" into nyc-dev