Merge "Add IncidentReport data structure to aidl for IncidentCompanionService and some extra parameters for incidentd."