Merge "Adding recovery image" am: e86aa7b9 am: abecf30a am: 9ef45d62 am:...

Merge "Adding recovery image" am: e86aa7b9 am: abecf30a am: 9ef45d62 am: 5d636ea8 am: 9b84a1c0

Original change: https://android-review.googlesource.com/c/platform/build/+/2636171



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