Merge changes from topic "am-e393bc0c-de30-4c66-bab9-fd30e91e7088" into q-keystone-qcom-dev

* changes:
  [automerger skipped] OPP: Check whether notifier is intialized before cancelling notification skipped: 8d65c2c766
  OPP: Check whether notifier is intialized before cancelling notification