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

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



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