Merge "Report RoR metrics in recovery system" am: b079fe666f am: 7bbf62a939 am: 70c9ef04f9

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

Change-Id: Id96baca270b7dc90373e7493629f8b02eca83c03