Merge "Fix IllegalStateException in DeviceStateManagerService" into udc-dev am: 01f04f3a am: 30b497f8 am: 6433e857

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



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