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

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



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