Merge "AVRCP: don't remove inactive media controllers"
am: 65c71f4025

Change-Id: I0bff2cab09993d3ff80857771574f129392fb4b2