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: 3ed9722b

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



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