Merge "ComponentName null check MUST proceed before creating ComponentKey." into ub-launcher3-calgary-polish
am: c8b997a21c

Change-Id: Ic13a75cdf4df956c6544dd1a168d1d37fbefb6c4