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

Change-Id: I948fa0ef55793fd8296369eabed5174bafad7224