Merge "Add license type: MIT+BSD are NOTICE licenses" am: e484b5413b am: 9a7ac5b57e am: 05412c3f8d

Change-Id: I176f6ee12a07fff320353d932205792093b3026b