Avrcp: Sync mirror-aosp-master and stage-aosp-master

There is a delta between mirror-aosp-master and stage-aosp-master.

This is probably due to a large number of commits being merged at once
by the auto-merger.  This CL synchronizes the two branches again.

Test: git diff
Change-Id: I9d30d162a13fb6416f3b4140aa5238f7e0e928f2