Merge "Fix stuck if resize split quickly" into udc-dev am: 2350a1d1 am: c82c30c7

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



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