[automerger skipped] Merge "Fix misconfigured recovery host test" into tm-dev...

[automerger skipped] Merge "Fix misconfigured recovery host test" into tm-dev am: 43d75a1d am: b7e7977e -s ours am: 0cd79301 -s ours am: 0af7a250 -s ours

am skip reason: Merged-In I13bb9595745f65a63070cf9fe030c9155f75e4d0 with SHA-1 9ce95441 is already in history

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



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