Merge "Minor tweaks to UserspaceRebootLogger" am: 2e1432b902 am: feeb1658b4

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513290

Change-Id: Icc07e9ca1d68e0b43aa42e3154ce06c20c417f3c