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

Change-Id: I8fa765d0f5c8e8ebea09745898dd1703f2799928