Merge "Removing tests used to ensure the transition from HIDL to AIDL works" into main