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

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

Change-Id: If4666d41859a0c7fd2429593277b4d942af01e7e