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

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

Change-Id: Ia2f2f67c5b0362d2e2de5782e5ed3ebd72902516