Merge "mediav2 CTS: Updated testAdaptiveBitRate" into stage-aosp-sc-ts-dev