Merge "Always dismiss split after folded the device" into tm-qpr-dev am: 258944c4

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



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