Merge "ueventd: require opt-in for modalias handling" am: d52b17ff0a am: 106e66e475
am: 002ae48f31

Change-Id: Iffc00a2bb262bf64d0de8095f936856f68f17042