Merge "Merge "streamquality: reduce ENABLE_PASS_DELAY to 5 seconds" into lollipop-mr1-cts-dev am: ee5668e042" into marshmallow-cts-dev am: d6f63214fb am: 9d5b3112f0 am: f8a8b861ae am: 717845f2cc
am: 5b20933dec

Change-Id: I8a511e63deeae9c9e0311361e26fef8e96f92ee5