Merge "update_crate_tests: Clean up" am: acec66d1b0

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

Change-Id: I3ecd8d44f12460346a8eca7601fc088709a87935