[automerger skipped] Merge "Fix shelf tracking distance for landscape app over...

[automerger skipped] Merge "Fix shelf tracking distance for landscape app over portrait launcher" into ub-launcher3-rvc-qpr-dev am: 5491b2e2 -s ours

am skip reason: skipped by user twickham

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

Change-Id: I1630b8d5468ad21fb09ebd349d9fd99ac058b592