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

Merge "Fix stuck when fullscreen launch" into udc-dev am: 7ed6f0ba am: 54703ece am: ccc3a171 am: c7b68a23

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



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