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

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

Change-Id: Ida1a28ad198193c44c1c74de6f7d53f9c79b6193