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: 82aa939d am: 16123199 am: d42f6c0c

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



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