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

Change-Id: I72a3843ed58127c0ead1dcd36126002a1220d4d4