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

Change-Id: I509f5d8ae4c8224ee1e7b8ceffd2a65f1da1254c