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

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



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