Merge changes from topic "am-de3f1aeba46b42b5a7ec8c1952b3f729" into main

* changes:
  [automerger skipped] Merge changes from topic "udc_qpr2_merge" into aosp-main-future am: 9871f1a6e4 -s ours
  [automerger skipped] Fix fs-verity API for secondary users am: bbc133a2ec -s ours