Merge "Fix stuck when fullscreen launch" into udc-dev am: 7ed6f0ba am:...

Merge "Fix stuck when fullscreen launch" into udc-dev am: 7ed6f0ba am: bb6df2da am: 5d60626f am: f7f6f79a

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



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