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

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

Change-Id: I31426dee822724228579dee4827169f239e1ac1c