Merge "db845c: Add fw_devlink=permissive to the boot arguments" am: 7e64ea31a5 am: 29e6b8138b

Change-Id: Id19598c48d05433c92e26c63e5a6379153df2e97