Merge changes from topic "cherrypicker-L21100000961067008:N34400001375316978" into udc-dev

* changes:
  Instrument SDK level and change IDs to help testing
  Use "don't actively prefer" timeout when avoiding bad wifi