Merge "Address lifecycle crash in car sysui" into rvc-dev am: c42d4b65c8 am: 9b9a8e1b55

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

Change-Id: I33d90a4b85ca32642998d415feab90cdda0e403d