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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idffa8d9f4d9473b205244a92e222cee5e2d6f99b