Merge "Add vendor notice header at the top of Third-party licenses" am: 05e75be642
am: cb476f5fd6

Change-Id: If6683d31403f75765acef1e2b431f681391af5eb