Merge "Attempts fixing DismissSplitScreenByDivider flakiness" into udc-qpr-dev am: 48a3533f55

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

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