Merge "Update A2dpSinkStreamHandlerTest"
am: 701580a4d0

Change-Id: Iee23bf10803cf8635f9c6af38570dee37032c9e7