Merge "Protect against NPE when updating state" into udc-dev am: ec5540c745 am: 182ed04f7e am: 00cca4af97 am: 14c9e89e47
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22972200 Change-Id: I44c6a382a3a7e3ae6b6965efc91543035650f03c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: