Merge "Merge "streamquality: reduce ENABLE_PASS_DELAY to 5 seconds am: c705f34f0c" into marshmallow-cts-dev am: a1f690956d" into nougat-cts-dev am: 1868140684 am: a83273ef64 am: 6253824876
am: 099abcd174

Change-Id: I9d63c7057a7e0871408854111640276b3900a429