[automerger skipped] Merge "Ensure userspace reboot is supported before logging" into rvc-dev am: 56a5a72e am: e3a9ef31 am: 92e92747 am: bf5c6c24 -s ours

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

Change-Id: Iad478774ede357dbbdd5241ea3aea74e9a217bfe