Merge "Update divider if split transition with display change" into udc-dev...

Merge "Update divider if split transition with display change" into udc-dev am: 895e7a93 am: 25458f9b

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



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