Merge "Improve handling of external deletion in LauncherProvider.delete" into ub-launcher3-calgary-polish
am: bb248828fc

Change-Id: I5afa0ef4bd5bd3a25d4002ac8a08bd5fa0ce638c