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

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



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