Merge "Report RoR metrics in recovery system" am: b079fe666f

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

Change-Id: I6da88dfdf9558de568f9aa2c30cfbfb159b1f669