Merge "AVRCP: Reset mActivePlayerId on cleanup"
am: 87ed977250

Change-Id: Ia87da453698c7c8ea1c3a3149e4e026c2f92d8af