Merge "Add @Nullable to SensorManager.getDefaultSensor's return value"