Merge "Fix wrong divider bar layering" into sc-v2-dev am: dec87d49ca

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

Change-Id: I940aca38a072a56a3e2a6ba8b579de1405d1236d