Merge "Update the NOTICE.xml.gz generation logic in soong" into main