Merge "Use readUniqueFileDescriptor in incidentd service" into udc-dev