Merge "AudioAttributes: fix setInternalLegacyStreamType()" into qt-dev am: 935f4e8d4b
am: 3901cbdf84

Change-Id: Id4f78fdf21d870a3d2d899cecb162cea9f71447d