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

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

Change-Id: I4f1a2b13d0508fe3b94d519ce0f7966fa9770360