Merge "Add license type: contains GPL+LGPL are RESTRICTED" am: 5aebaea7bf

Change-Id: I7f88a4c1048dac5818f9da3cb61a344e652c069d