Merge "Reflect changes made to h/i/audio/common/5.0/types.hal"