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

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

Change-Id: Ib2a400a9b8c3987c65ce1440d0e0c938da5819a5