Merge "Move comment to license_note" am: 60bd102826 am: e9574727d4

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

Change-Id: I79c1786377f9f4c7b3812cafe1439d96475d19b7