Merge changes from topic "cherrypicker-L74700030005440312:N13700030084650775" into aosp-24Q3-ts-dev

* changes:
  Fix CDM discovery timeout
  Fix CDM UI regressions