Merge "streamquality: reduce ENABLE_PASS_DELAY to 5 seconds" into lollipop-mr1-cts-dev am: ee5668e042 am: 2cd7545ae6 am: 52843c07df am: 0af39bc3e0 am: 452fd3a55a
am: 430dbc1647

Change-Id: I821aa85759f57b717cc1a7d9bfb64a95fb696664