Merge "AVRCP: Fix issues around trackChanged notification" am: fac62fd8cb am: 4c04778c2d
am: d70e87127a

Change-Id: If4bdd4b07cb7442f245681bb1badb705b9128e2a