Merge changes from topic 'b/62584347' into oc-dr1-dev

* changes:
  Modified error code for OPERATION_NOT_ALLOWED
  Change mapping of QMI error