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

Change-Id: Icdb07f043bf52286c74492623b44a1dbf441464d