Merge "Merge "Fix MediaHTTPConnection.disconnect() blocking for a long time." into qt-dev am: 0c1f41d303 am: eed3cc94d7" into qt-r1-dev-plus-aosp
am: 9c73457f03

Change-Id: Iccacfffb860f8e8e099495926d278167f7c906ee