Merge "Minor fixes and improvements for crate health code." into main am: 3b3f1137b9

Original change: https://android-review.googlesource.com/c/platform/development/+/3106857

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