[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: 044758be -s ours am: af55a39a -s ours

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

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



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