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

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



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