Merge "MediaHTTPConnection: move connection states into an inner class" am: abe16aff am: 6be164a3 am: 33435110 Change-Id: I8042e41f795a49ce421cb59229b1974bf0afc19a