Merge "Account for span greater than 1 in getReorderRadius" into tm-qpr-dev am: 89b8f652

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



Change-Id: Iae70d6d2bccce247803774434f22977e807446b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>