Merge changes from topic "am-4b5e9355355d4f6a9ac16ab1c82c7e21" into main

* changes:
  [automerger skipped] Merge "Fix uses_libs properties for OneMedia." into aosp-main-future am: 768a8eb803 -s ours
  [automerger skipped] Fix uses_libs properties for OneMedia. am: ca4c93e64f -s ours