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

Change-Id: I339289d7d847b6776846ae2c6a16774566ec860c