Merge "ueventd: require opt-in for modalias handling"