Merge "Fix misconfigured recovery host test" am: 0f5c9f376b am: ce0b24454e am: 628a68b765

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

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