Merge "Fix launch app crash could stuck system ui render thread." into tm-qpr-dev am: 01276d68

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



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