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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8dbb655ca1511ab9a194c68171995b93fb95a24c