Merge "Remove the special logic of the divider bar z-ordering" into tm-qpr-dev am: 4f8c3f08

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



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