Merge "Extend the metrics for resume on reboot" am: 1c5faf6141 am: f593e71276 am: 2184af92df

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I96ac197d6f09ff89f1a74471413e213f6649f126