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

[automerger skipped] Merge "Fix misconfigured recovery host test" into tm-qpr-dev am: 5556cd52 -s ours am: 307dc622 -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/+/19659962



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