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

Change-Id: I8dc3dee135f422781bc8164fc5021de0dee076fa