[automerger skipped] Merge "Fix npe in onStart()" into 24D1-dev am: da945139 -s ours

am skip reason: Merged-In I7a6e7387e5e8712f93e1c8df19e8741c541a1b2f with SHA-1 fccca461 is already in history

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



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