Merge "Android13 + Android12-GSI cf_x86_64 have both AIDL and HIDL HAL" into android13-tests-dev