Merge "Use default icon if notification icon is null." into ub-launcher3-dorval
am: a431fbb850

Change-Id: I493ea6c4248c81f33e5267e2450e646cff23c955