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

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



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