Merge "audiopolicy: engineconfigurable: fix phone configuration" into qt-dev am: 4fe9f3e9ad
am: bd9435d503

Change-Id: I81c12cd2199e2cd1b7173a907ba9d25ab57afb82