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

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

Change-Id: I6257d9f5af5e237fbfeab0de1946825e677146a7