Merge "Temporary NPE mitigation." into tm-dev am: 08009d5e

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



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