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

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

Change-Id: I757fc9986492f39ae9bf9763c11aa3124e8e0a1b