Merge changes from topic "presubmit-am-59c02c23dbb842959140ace7fcb0e752" into udc-dev

* changes:
  [automerge] Add new reason code and status code for session conflict. 2p: fbe75bbcf1
  Add new reason code and status code for session conflict.