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

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



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