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

Change-Id: I0eba2e16807b03a7bbb1ebb2e22f1a4faf9576f3