Merge changes from topic "PPR1.180517.004" into p-keystone-qcom

* changes:
  Merge PPR1.180517.004
  Revert part of "SCO: Suspend and resume A2DP before SCO setup and after SCO tear down"
  Merge PPR1.180516.001