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

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



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