Merge "Cleanup code that should never be null" into tm-qpr-dev am: ed74a53d

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



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