Merge "AudioAttributes: fix regression with setLegacyStreamType in Builder" into qt-dev am: 22ad8a5e am: fd72d60f Change-Id: I20f76d7725dab1c329af50e7a58ab7f2c1d4f222