Merge "Add null checking when deleting hotword detectors" into udc-dev