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

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

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