Merge "Allow brick OTA package to be sideloaded in recovery" am: aff08259...

Merge "Allow brick OTA package to be sideloaded in recovery" am: aff08259 am: 2f5744f5 am: 2643880e am: 3d576c75

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2486129



Change-Id: Iea25f9be2dbfc632d3211132e6066648966f8fa8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>