Merge "Merge "Update the owner file for recovery" into sc-dev am: 12c8ed3c...

Merge "Merge "Update the owner file for recovery" into sc-dev am: 12c8ed3c am: 98e1d1b2" into sc-v2-dev-plus-aosp am: 577d223a

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

Change-Id: If3a8bdf4c1ef2d5f7ab5d3adb78bebcae91a320b