[automerger skipped] Merge "Ensure userspace reboot is supported before logging" into rvc-dev am: 56a5a72e73 -s ours am: 4ce404782f -s ours

am skip reason: Change-Id Ic3041ff3abe0d2641d3d99fc8e816f1f5c491a34 with SHA-1 eb52a69444 is in history

Change-Id: I425cbd54cd24b0172d1fb19a9525bb97ce545d85