Merge "audiopolicy: engineconfigurable: update structure for Q" into qt-dev
am: 9cd03f4bc0

Change-Id: I85b86a726b8694aa930ca6a9cb1b8111f3cf2cc8