Merge "Add null check before notifying CUJ events" into sc-v2-dev am: 60316d327f

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

Change-Id: I406eee540d6fa8e36f5975ef39ee8228e47e2322