Merge "recovery_host_test is already running in presubmit" am: 7722a968bf am: e620e8065d

Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/1577883

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id376e66f60f4da08679e84eeda0dddf2022a13bd