Merge "Re-enable leak detection on tablets" into sc-v2-dev am: dc66ec82a0 am: 066bb68a29

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

Change-Id: I062a3c1d6291d2cb9f5f09709d6b1355475e358c