Refactor UpdatePrefsAndReportUpdateMetricsOnReboot am: 4061c51718

Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1718430

Change-Id: Ibe7a80d23adf2dcb1b5a9c50404aedc6c321c133