Merge "AVRCP: Fix crash when app change during shutdown" am: abc3d7eb7e
am: 80160a9af0

Change-Id: Idf4e69564fbfb38dad765e5353261c7a6cb350cf