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

Change-Id: I2391dbb3d4cb6ca835d4c7b53906ef92e086c783