Merge "Fix multiple divider when resize with rotate" into udc-dev am: a9025bc5

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



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