Merge "Add license type: GPL+LGPL are RESTRICTED licenses" am: 5948c10ef1 am: d1d8f301c0 am: 9fe8196b56

Change-Id: I704731adb1324b3149974c465f934a7742756fa5