Merge "Fix not showing divider when re-entering split with rotation" into udc-dev am: a30b77d0 am: 819712bf am: 48a28a81 am: b16fe6db

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



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