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

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



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