Merge "Improving diagnostics when Launcher dies while in ContentProvider call" into sc-dev am: 26cd946f29 am: 9947fd85b4

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

Change-Id: I667fc64aaff7b2fb49695f565e0407e99cdc5361