Merge "update_crate_tests: fail gracefully" am: f9d75c1f5a am: 216c726555

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I15a1844c458ad3e335bc575e6aa88a53d0b9236f