Merge "AVRCP: Add PlaybackState for Track Changed" am: 5d52214c70
am: 64242edd98

Change-Id: I01e361938de5e981edb07565bb4dd90a5363bea3