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: 2c34ef5c am: a868786c am: 94e54bd1

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



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