Merge "Protect against NPE when updating state" into udc-dev am: ec5540c7 am: 182ed04f

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



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