Merge "Add sysprops for start & end of userspace reboot"
am: c5282e4c6b

Change-Id: I1fb2fad445cae5c902970e974fe1964809127c41