Merge "Report more metrics in RecoverySystem" am: d880cf50a5

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

Change-Id: Ibcf9b0627ac5bff5b3ff010eaafe5a945b6b5ab4