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

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



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