Merge "Fix several flaky DeviceStateManagerServiceTests" into udc-dev-plus-aosp