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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I833356a154218a3e2c914efd4b2a6242e37a26c6