Merge "Fix an issue where the highlight for drag to split was incorrect" into...

Merge "Fix an issue where the highlight for drag to split was incorrect" into tm-qpr-dev am: 61d49596 am: 30919118

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20389925



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