Merge "Prevent rendering divider bar into wrong orientation" into sc-v2-dev...

Merge "Prevent rendering divider bar into wrong orientation" into sc-v2-dev am: 85c712a6 am: 2668ade5

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

Change-Id: I232f4317f95aa536fc1fe087ac5f25f4fb7e6c0d