Merge "Fix test failures in releasetools" into main am: 0c8b7efd am:...

Merge "Fix test failures in releasetools" into main am: 0c8b7efd am: 14f94474 am: 6ef6964c am: 51638f74

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



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