Merge "AVRCP: update metadata and state more consistently"
am: fd8536160d

Change-Id: Iec5288143acb2aa8ffa1548acf551f097306c132