Merge "Fix CTS AudioAttributesTest#testGetVolumeControlStreamVsLegacyStream" into sc-dev