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

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

Change-Id: I6c39aca1df23368611a754eef3be4dfe3d35a4fe