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

Change-Id: I494db6c231b0082447be740c5ac712a1e33350d2