[automerger skipped] Merge "Fix divider bar shown on top of tasks above split...

[automerger skipped] Merge "Fix divider bar shown on top of tasks above split pair" into sc-v2-dev am: 61cd3bc7 am: 51a7c22d -s ours

am skip reason: Merged-In Iaab59851a65f12556c1b1e894914ae197b8d8401 with SHA-1 5e28cb5f is already in history

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

Change-Id: I1603ad1b1d29341b07979d9d748ac4be54e38e3f