Merge "Fix potential crash when exit splash screen" am: 18b88655

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



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