Merge "Update the owner of recovery systems" am: 612b7e7d1d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I53f4a9f7048850937e0355b18dfb483dedeb7f2e