Merge "MediaBrowserService: Clean up ConnectionRecord when browser is dead" into oc-mr1-dev
am: bbf55bb7ae

Change-Id: I4e14e80a31c0eed3c897e35720bff1f694f7a007