Merge "Consolidate split divider show/hide behavior" into tm-qpr-dev am: 064d88d8b8

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

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