Merge "AML: Remove unbundling MediaMetadata in MediaSessionRecord"