Merge "Fix divider rounded corner on specific devices" into sc-v2-dev am: 44850438d9 am: 481eb9e0ff

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

Change-Id: I22c370bf33ec1e74cd2edfb31feb0f5af40e3a4d