Merge "Move comment to license_note" am: 60bd102826

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

Change-Id: If09347695a9ff998bfe13ad25af8a219306297e1