Merge "Fix IllegalStateException in DeviceStateManagerService" into udc-dev...

Merge "Fix IllegalStateException in DeviceStateManagerService" into udc-dev am: 01f04f3a am: 9d7cc999 am: ad2337da am: b5126be8

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



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