Merge "audiopolicy: engineconfigurable: fix phone configuration" into qt-dev