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