Merge "Fix IllegalStateException in DeviceStateManagerService" into udc-dev am: 01f04f3a46

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

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