Merge changes from topic "cherrypick-checkSessionParams-ixtl2uw7uua" into udc-dev-plus-aosp

* changes:
  [automerged blank] [RESTRICT AUTOMERGE] Null is a valid volume uuid. 2p: 3fae7a0c 2p: 2dc278f6
  [automerge] [RESTRICT AUTOMERGE] Null is a valid volume uuid. 2p: 3fae7a0c
  [automerge] [RESTRICT AUTOMERGE] Add a debug workaround for the tests. 2p: 3f60b9a1
  [RESTRICT AUTOMERGE] Null is a valid volume uuid.
  [RESTRICT AUTOMERGE] Add a debug workaround for the tests.