Merge "Fix IllegalStateException in DeviceStateManagerService" into udc-dev