Merge "Fix splashscreen listener not being called" into tm-dev am: 7d7fa82f

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



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