Merge "Fix missing avrcp disconnect request"
am: cedc87cb23

Change-Id: If192c84ae5361d182b49f09d298e325f9dfa9bfc