Merge "Add a CTS workaround for AID_CROS_EC." into android15-tests-dev