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

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



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