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

Change-Id: I13dc5d9aef4bccb435d06fe96852c84fcaf99da3