Merge changes from topic "am-56f7bb82-8ae0-413e-9302-2736db26492c" into q-keystone-qcom-dev

* changes:
  [automerger skipped] OPP: Fix ANR during retry failed transfer skipped: ce1122f97c
  OPP: Fix ANR during retry failed transfer