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

Change-Id: I5e393a0c65969f9d2c67b874f19c0935a5982114