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

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



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