Merge "Don't dismiss split during enter if already visible" into udc-dev am:...

Merge "Don't dismiss split during enter if already visible" into udc-dev am: 1f23db54 am: 0a3a98a1 am: eeb107e0 am: 8485a917

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



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