Merge "Prevent null references when updating state" into tm-qpr-dev am: 42663b07 am: d9f9ceb2

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



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