Merge "Fuzz incident AIDL service"