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: cbc52703

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



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