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

Change-Id: I29968a4ffd660dcc3ce2dd354912263b3ae0325c