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

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

Change-Id: Ie40c31fbee9e29c9c00756fb8659ead588180d3f