Merge changes from topic "am-77a3b54365744c28b98751b439776b01" into main

* changes:
  [automerger skipped] Merge "Add a CTS workaround for AID_CROS_EC." into android15-tests-dev am: 09bfe337aa -s ours
  [automerger skipped] Add a CTS workaround for AID_CROS_EC. am: 39ff5d6ec4 -s ours