Merge changes from topic "am-a6478b5b-afd2-4c4d-b3fb-5c2307ded983" into q-keystone-qcom-dev

* changes:
  [automerger skipped] OPP: Fix SDP event receive issue. skipped: eab2d00c6b
  OPP: Fix SDP event receive issue.