Merge "Add the AVRCP Target Service (2/2)"
am: 61265410e8

Change-Id: I6174f0e40d0a9bcb0f079b1f0ff87b3a5188bfef