Merge "MediaHTTPConnection: move connection states into an inner class" am: abe16aff07
am: 6be164a330

Change-Id: Ic78d25d9889999186b236f5b6ab978ae5a95e3e6