Merge "media: Add flags, channelMask, and UID to audio session callbacks" into new-mm6.0