Merge "Merge "Fix MediaHTTPConnection.disconnect() blocking for a long time."...
Merge "Merge "Fix MediaHTTPConnection.disconnect() blocking for a long time." into qt-dev am: 0c1f41d3 am: ccb6ec86" into qt-r1-dev-plus-aosp
am: 78c5887e
Change-Id: Ie9ef8f01dfff23bc261323834e706bd09f8029dd