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

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



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