Merge "Fix timeout when dismissing split screen to two pane mode" into...

Merge "Fix timeout when dismissing split screen to two pane mode" into tm-qpr-dev am: b48c123b am: 0f306974

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



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