Merge changes from topic "am-4837d6d2-eda8-400c-8ad0-7671a40b8d06" into q-keystone-qcom-dev

* changes:
  [automerger] OPP: Handle URI Security Exception on OPP Transfer am: 8a0da83369
  OPP: Handle URI Security Exception on OPP Transfer