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

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

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



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