Merge "Remove the special logic of the divider bar z-ordering" into tm-qpr-dev...

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

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



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