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

Merge "Fix multiple divider when resize with rotate" into udc-dev am: a9025bc5 am: 8545c66a am: f2a8b6d8 am: 58c5b98a

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



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