Merge "Do not use Cargo.lock during cargo build." am: 73c7e65403 am: 75c2b4d05e

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

Change-Id: Id9faf1df23e45dbce9c08d490a86b02409621b30