Merge "Improving diagnostics when Launcher dies while in ContentProvider call" into sc-dev am: 26cd946f29 am: 1065e20c30 am: 4ac7a71874

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14991671

Change-Id: Ibf7ccaf782a8ce299e729c04bc9f762013949491