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

Change-Id: I66d0f19f3981d27242d5b085f30cf322008f0e5e