Merge "Don't log userspace_reboot.started/finished properties from init" am: 15e4f6fe5a am: 8e4014f2de am: 42da192824

Change-Id: I4710188ffb015e3a2b25b79b7bd10bb826e5dd6e