[automerger skipped] Fix potential crash when exit splash screen am: 18646d58 -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: Iceba8aa7a992e12196b7b34c19d874cf089c3e9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>