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 am: d1826996

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



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