[automerger skipped] Merge "Fix potential crash when exit splash screen" into...

[automerger skipped] Merge "Fix potential crash when exit splash screen" into tm-qpr-dev am: 58db7ce1 -s ours am: 98849514 -s ours

am skip reason: Merged-In I4d3b184252ed9516827812adfa0c76e07a6527e7 with SHA-1 1a797c71 is already in history

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



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