Merge "Protect against NPE when updating state" into udc-dev am: ec5540c745 am: a48d644811 am: ff9118b486

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

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