Merge "Add default value to Bluetooth AVRCP version property get" am: 84cf0b2a4b am: 0347c57ef5
am: 4d20929038

Change-Id: I5086968b1ecaf0d171f0e85c73ca255636ecb92f