Merge changes from topic "am-59c63cf4003e489c97822550b1c00293" into main

* changes:
  Merge changes from topic "am-920db2a13e4a4678b51b6f69a93a73ee" into android15-tests-dev am: 6fb597e6d1 -s ours
  [automerger skipped] Merge "Move bionic test libraries to a default, for easy consumption in cts." into android14-tests-dev am: 430eb3e96b -s ours am: 741541d307 -s ours