Merge "Fix cargo2android's license block preservation" am: dddc6e0873

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

Change-Id: I961b9db90f9e3fd1adc680be560bcc48c05cfff1