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

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

Change-Id: Ief2d45313570bb8f402d3437db1fb1e6b1a58a14