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

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

Change-Id: I10c0ccc52b5e496e09c897f83e4776887fb5d1cf