Merge "Fix not showing divider when re-entering split with rotation" into udc-dev am: a30b77d0

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



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