Merge "Better diagnosing leaked activities." into sc-dev am: 161b27d5c5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a0ef05fca9fdeeca6afb4741ba68f0219403f61