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

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



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