Merge "Fix recovery OTA error on merged targets" am: 9e0472e9 am: 9f7c2f93

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



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