Merge "ueventd: don't skip restorecon after the cold boot" am: 82c88d9b00
am: 6df55e4cf0

Change-Id: I0a2c07ddd7618372752ef6747f355ac02e68f334