Merge "Move comment to license_note" am: c4bba9390f am: 8cd36ab6f3

Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/2008358

Change-Id: I6b5d9c30e6903cbce08cdd8ceddbf15db3818c44