Merge "AVRCP: Stop MediaBrowser attempts on shutdown"
am: d7b3a52a92

Change-Id: If1db2c06f065eb8810ba3a67bf6eacf543eed96d