Merge "Fix license texts." am: 632da0a501 am: b375f76135

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

Change-Id: I8e3a4ed6afaae1f7d9618420e827b47b335f3334