Merge "Log UserspaceRebootReported atom from system_server" am: 9b6f6674eb am: 1db5e3a0cf

Change-Id: I8ee87878d8f8c7d16e89dd134506d2bcfc44cedf