Merge "MediaSessionRecord: Clean up codes"