[automerger skipped] Merge "Log UserspaceRebootReported atom from system_server" am: 9b6f6674eb am: 1db5e3a0cf am: 2727519309 -s ours
am skip reason: Change-Id Ib9e2c6cef7094ccac7862be249d619212f0013fd with SHA-1 779d6bee21 is in history

Change-Id: I1b8f8ae273b67d5a376c41665f8bc44c412b523f