[automerger skipped] Merge "Fix wrong divider position after rotation" into...

[automerger skipped] Merge "Fix wrong divider position after rotation" into udc-dev am: 28d58eca am: d1f0ec97 -s ours

am skip reason: Merged-In Ica32c817ef414f550931a50ec919e3114a075e2c with SHA-1 9ddbdcae is already in history

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



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