Merge changes I547d1950,I7b958a9f

* changes:
  AVRCP Controller Disable Automatic Focus Request
  A2DP Sink: Focus gain while transient loss